<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
| app/controllers/application_controller.rb |
<<<<<<< HEAD
100.00 % |
2 |
1 |
=======
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
app/admin/admin_users.rb |
40.00 % |
27 |
20 |
8 |
12 |
0.40 |
| app/admin/authors.rb |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
app/controllers/application_controller.rb |
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
100.00 % |
36 |
22 |
22 |
0 |
1.95 |
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
app/controllers/application_controller.rb |
<<<<<<< HEAD
100.00 % |
2 |
1 |
1 |
=======
=======
=======
app/controllers/books_controller.rb |
100.00 % |
28 |
14 |
14 |
0 |
13.86 |
=======
40.91 % |
36 |
22 |
9 |
13 |
0.41 |
>>>>>>> 49e8a6c (Rebased)
=======
100.00 % |
36 |
22 |
22 |
0 |
1.95 |
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.86 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
| app/decorators/author_decorator.rb |
>>>>>>> fd6db03 (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
18 |
10 |
10 |
0 |
12.90 |
| app/decorators/category_decorator.rb |
100.00 % |
3 |
2 |
2 |
0 |
1.00 |
| app/decorators/paginating_decorator.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
| app/admin/books.rb |
100.00 % |
<<<<<<< HEAD
57 |
41 |
41 |
0 |
2.49 |
=======
77 |
51 |
51 |
0 |
4.20 |
>>>>>>> b28889f (Fix)
=======
app/admin/books.rb |
100.00 % |
77 |
51 |
<<<<<<< HEAD
11 |
40 |
0.22 |
>>>>>>> 49e8a6c (Rebased)
=======
51 |
0 |
4.20 |
>>>>>>> 872e675 (Fix)
| app/admin/categories.rb |
100.00 % |
31 |
18 |
18 |
0 |
2.17 |
| app/admin/dashboard.rb |
42.86 % |
14 |
7 |
3 |
4 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
4.71 |
=======
5.86 |
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 490b01d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
| app/controllers/application_controller.rb |
100.00 % |
2 |
1 |
<<<<<<< HEAD
=======
=======
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
=======
>>>>>>> f0e2e12 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
app/admin/admin_users.rb |
40.00 % |
27 |
20 |
8 |
12 |
0.40 |
| app/admin/authors.rb |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
app/controllers/application_controller.rb |
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
app/controllers/application_controller.rb |
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
100.00 % |
36 |
22 |
<<<<<<< HEAD
<<<<<<< HEAD
22 |
0 |
1.95 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
app/controllers/application_controller.rb |
<<<<<<< HEAD
=======
=======
>>>>>>> d9d85ca (Fix)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
app/controllers/application_controller.rb |
<<<<<<< HEAD
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
=======
=======
app/controllers/books_controller.rb |
100.00 % |
28 |
14 |
14 |
0 |
13.86 |
=======
app/controllers/books_controller.rb |
100.00 % |
24 |
12 |
12 |
0 |
13.50 |
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.86 |
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
| app/decorators/author_decorator.rb |
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> e59c273 (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
18 |
10 |
10 |
0 |
12.90 |
| app/decorators/category_decorator.rb |
100.00 % |
3 |
2 |
2 |
0 |
1.00 |
| app/decorators/paginating_decorator.rb |
100.00 % |
3 |
2 |
2 |
<<<<<<< HEAD
1 |
1 |
<<<<<<< HEAD
=======
=======
=======
app/controllers/books_controller.rb |
100.00 % |
28 |
14 |
14 |
0 |
13.86 |
=======
9 |
13 |
0.41 |
>>>>>>> 75fa7e1 (Rebased)
=======
22 |
0 |
1.95 |
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> e59c273 (Manifest_cache true)
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.86 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
| app/decorators/author_decorator.rb |
>>>>>>> fd6db03 (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
18 |
10 |
10 |
0 |
12.90 |
| app/decorators/category_decorator.rb |
100.00 % |
3 |
2 |
2 |
0 |
1.00 |
| app/decorators/paginating_decorator.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509ee (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273 (Manifest_cache true)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| app/admin/books.rb |
100.00 % |
77 |
51 |
51 |
0 |
4.20 |
| app/admin/categories.rb |
100.00 % |
31 |
18 |
18 |
0 |
2.17 |
| app/admin/coupons.rb |
100.00 % |
3 |
2 |
2 |
0 |
1.00 |
| app/admin/dashboard.rb |
<<<<<<< HEAD
42.86 % |
14 |
7 |
3 |
4 |
<<<<<<< HEAD
<<<<<<< HEAD
4.71 |
<<<<<<< HEAD
=======
=======
app/controllers/books_controller.rb |
100.00 % |
28 |
14 |
14 |
0 |
13.86 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
=======
app/controllers/books_controller.rb |
100.00 % |
24 |
12 |
12 |
0 |
13.50 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509ee (Featire specs)
=======
0.43 |
>>>>>>> 75fa7e1 (Rebased)
=======
5.86 |
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
app/controllers/books_controller.rb |
100.00 % |
28 |
14 |
14 |
0 |
<<<<<<< HEAD
13.36 |
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
13.86 |
>>>>>>> f6e2026 (Add login registration pages)
=======
>>>>>>> f0e2e12 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
>>>>>>> c033601 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.86 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
| app/controllers/application_controller.rb |
<<<<<<< HEAD
=======
app/decorators/author_decorator.rb |
>>>>>>> 02a399d (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.25 |
| app/decorators/book_decorator.rb |
90.00 % |
18 |
10 |
<<<<<<< HEAD
9 |
1 |
0.90 |
=======
10 |
0 |
12.90 |
>>>>>>> 8249ff3 (Add login registration pages)
=======
100.00 % |
2 |
1 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
app/controllers/application_controller.rb |
100.00 % |
2 |
<<<<<<< HEAD
<<<<<<< HEAD
1 |
1 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
=======
app/controllers/application_controller.rb |
=======
app/decorators/author_decorator.rb |
>>>>>>> aa7b40c (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
<<<<<<< HEAD
1.25 |
| app/decorators/book_decorator.rb |
90.00 % |
18 |
10 |
9 |
1 |
0.90 |
| app/decorators/category_decorator.rb |
100.00 % |
5 |
2 |
2 |
<<<<<<< HEAD
1 |
1 |
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
1 |
1 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
0 |
1.00 |
=======
13.86 |
=======
>>>>>>> e3e66f3 (Featire specs)
=======
app/controllers/books_controller.rb |
100.00 % |
24 |
12 |
12 |
0 |
13.50 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
0.43 |
>>>>>>> 49e8a6c (Rebased)
=======
5.86 |
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
| app/controllers/books_controller.rb |
<<<<<<< HEAD
93.75 % |
31 |
16 |
=======
<<<<<<< HEAD
93.33 % |
30 |
>>>>>>> 93bdda9 (Featire specs)
15 |
1 |
<<<<<<< HEAD
13.94 |
=======
14.13 |
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
=======
app/controllers/books_controller.rb |
>>>>>>> 752f0c0 (Featire specs)
100.00 % |
24 |
12 |
12 |
0 |
13.50 |
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
6.14 |
| app/controllers/reviews_controller.rb |
100.00 % |
19 |
10 |
10 |
0 |
1.30 |
| app/controllers/users_controller.rb |
86.67 % |
31 |
15 |
13 |
2 |
2.93 |
=======
1.86 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
| app/decorators/author_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
23 |
12 |
<<<<<<< HEAD
<<<<<<< HEAD
12 |
0 |
<<<<<<< HEAD
24.50 |
>>>>>>> b28889f (Fix)
=======
0.90 |
| app/decorators/category_decorator.rb |
100.00 % |
5 |
2 |
2 |
=======
app/controllers/application_controller.rb |
100.00 % |
2 |
1 |
1 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
1.86 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
| app/decorators/category_decorator.rb |
100.00 % |
5 |
2 |
2 |
=======
app/controllers/application_controller.rb |
=======
app/decorators/author_decorator.rb |
>>>>>>> bd8bda4 (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.25 |
=======
=======
=======
=======
>>>>>>> f0e2e12 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b (Manifest_cache true)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> fc3774f (Featire specs)
app/controllers/books_controller.rb |
<<<<<<< HEAD
93.75 % |
31 |
16 |
15 |
1 |
13.94 |
=======
<<<<<<< HEAD
93.33 % |
30 |
15 |
14 |
1 |
14.13 |
=======
=======
app/controllers/books_controller.rb |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
=======
app/controllers/books_controller.rb |
>>>>>>> 4e81ea2 (Featire specs)
=======
app/controllers/books_controller.rb |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
100.00 % |
24 |
12 |
12 |
0 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
13.50 |
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
13.86 |
>>>>>>> 1214e1f (Add login registration pages)
=======
13.50 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
6.14 |
| app/controllers/reviews_controller.rb |
100.00 % |
<<<<<<< HEAD
19 |
10 |
10 |
0 |
1.30 |
=======
17 |
9 |
9 |
0 |
1.33 |
>>>>>>> 824bb2b (Featire specs)
| app/controllers/users_controller.rb |
86.67 % |
31 |
15 |
13 |
2 |
2.93 |
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
app/controllers/application_controller.rb |
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
app/decorators/author_decorator.rb |
>>>>>>> 02a399d (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
=======
44.44 % |
>>>>>>> 7c4ea7f (Fix)
18 |
9 |
4 |
5 |
4.67 |
| app/admin/orders.rb |
100.00 % |
3 |
2 |
2 |
0 |
1.00 |
| app/controllers/application_controller.rb |
100.00 % |
15 |
10 |
10 |
<<<<<<< HEAD
9 |
1 |
0.90 |
| app/decorators/category_decorator.rb |
100.00 % |
5 |
2 |
2 |
<<<<<<< HEAD
1 |
1 |
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
0 |
1.00 |
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
app/controllers/application_controller.rb |
=======
app/decorators/author_decorator.rb |
>>>>>>> 183b6c5 (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.25 |
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
0 |
47.60 |
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
| app/decorators/book_decorator.rb |
90.00 % |
18 |
10 |
9 |
1 |
0.90 |
| app/decorators/category_decorator.rb |
100.00 % |
5 |
2 |
2 |
<<<<<<< HEAD
1 |
1 |
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
| app/decorators/author_decorator.rb |
100.00 % |
7 |
4 |
<<<<<<< HEAD
3 |
1 |
0.75 |
>>>>>>> 75fa7e1 (Rebased)
=======
4 |
0 |
1.50 |
>>>>>>> 67ab529 (Fix)
| app/decorators/book_decorator.rb |
<<<<<<< HEAD
<<<<<<< HEAD
90.00 % |
18 |
10 |
9 |
1 |
0.90 |
| app/decorators/category_decorator.rb |
100.00 % |
5 |
2 |
2 |
<<<<<<< HEAD
1 |
1 |
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
app/controllers/application_controller.rb |
=======
app/decorators/author_decorator.rb |
>>>>>>> aa7b40c (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.25 |
| app/decorators/book_decorator.rb |
90.00 % |
18 |
10 |
9 |
1 |
0.90 |
| app/decorators/category_decorator.rb |
100.00 % |
5 |
2 |
2 |
<<<<<<< HEAD
1 |
1 |
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
app/controllers/application_controller.rb |
100.00 % |
2 |
1 |
1 |
>>>>>>> 08edf50 (Featire specs)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
| app/controllers/books_controller.rb |
<<<<<<< HEAD
93.33 % |
30 |
15 |
14 |
1 |
14.13 |
=======
=======
app/controllers/books_controller.rb |
>>>>>>> 752f0c0 (Featire specs)
=======
app/controllers/books_controller.rb |
>>>>>>> 4e81ea2 (Featire specs)
=======
app/controllers/books_controller.rb |
>>>>>>> 08edf50 (Featire specs)
100.00 % |
24 |
12 |
12 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
13.50 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
13.86 |
>>>>>>> 1214e1f (Add login registration pages)
=======
13.50 |
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 0341d6d (Manifest_cache true)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> d245196 (Manifest_cache true)
=======
>>>>>>> 4bf888b (Featire specs)
=======
>>>>>>> 304cd28 (Manifest_cache true)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
app/controllers/books_controller.rb |
93.75 % |
31 |
16 |
15 |
1 |
<<<<<<< HEAD
13.94 |
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
app/controllers/books_controller.rb |
>>>>>>> 752f0c0 (Featire specs)
=======
app/controllers/books_controller.rb |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
app/controllers/books_controller.rb |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
app/controllers/books_controller.rb |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
14.94 |
| app/controllers/coupons_controller.rb |
>>>>>>> 5b7749a (Fix)
100.00 % |
14 |
8 |
8 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
13.50 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
>>>>>>> f0e2e12 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
13.86 |
>>>>>>> 1214e1f (Add login registration pages)
=======
13.50 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
2.88 |
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae884b4 (Fix)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 4bf888b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> d9d85ca (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
6.14 |
| app/controllers/order_books_controller.rb |
90.32 % |
54 |
31 |
28 |
3 |
1.94 |
| app/controllers/orders_controller.rb |
100.00 % |
7 |
4 |
4 |
0 |
2.75 |
| app/controllers/reviews_controller.rb |
100.00 % |
<<<<<<< HEAD
17 |
9 |
9 |
0 |
1.33 |
=======
19 |
10 |
10 |
0 |
1.30 |
>>>>>>> ae884b4 (Fix)
| app/controllers/users_controller.rb |
86.67 % |
31 |
15 |
13 |
2 |
2.93 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
=======
>>>>>>> ae884b4 (Fix)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 2179316 (Manifest_cache true)
=======
>>>>>>> d9d85ca (Fix)
| app/decorators/author_decorator.rb |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
1.25 |
>>>>>>> ae2a012 (Manifest_cache true)
=======
=======
>>>>>>> 2179316 (Manifest_cache true)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
75.00 % |
7 |
4 |
3 |
1 |
0.75 |
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
1.25 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2179316 (Manifest_cache true)
=======
=======
1.25 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
1.25 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| app/decorators/book_decorator.rb |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
100.00 % |
=======
66.67 % |
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
100.00 % |
>>>>>>> 67ab529 (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
100.00 % |
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
100.00 % |
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
100.00 % |
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
23 |
12 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
12 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
24.50 |
=======
12.70 |
=======
90.00 % |
18 |
10 |
<<<<<<< HEAD
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
=======
10 |
0 |
12.90 |
>>>>>>> 1214e1f (Add login registration pages)
=======
27.58 |
>>>>>>> 7c4ea7f (Fix)
| app/decorators/order_book_decorator.rb |
100.00 % |
9 |
5 |
5 |
0 |
<<<<<<< HEAD
1.00 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
12 |
0 |
<<<<<<< HEAD
25.67 |
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
12 |
0 |
24.50 |
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
12 |
0 |
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
25.67 |
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
12.70 |
=======
90.00 % |
18 |
10 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
10 |
0 |
12.90 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
2.60 |
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
| app/decorators/category_decorator.rb |
100.00 % |
<<<<<<< HEAD
3 |
2 |
2 |
0 |
1.00 |
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
app/decorators/order_decorator.rb |
100.00 % |
13 |
8 |
8 |
0 |
14.75 |
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
| app/decorators/paginating_decorator.rb |
100.00 % |
3 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
5 |
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
5 |
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
2 |
2 |
<<<<<<< HEAD
=======
app/controllers/application_controller.rb |
=======
app/decorators/author_decorator.rb |
>>>>>>> aa7b40c (Manifest_cache true)
100.00 % |
7 |
4 |
4 |
0 |
1.25 |
| app/decorators/book_decorator.rb |
90.00 % |
18 |
10 |
9 |
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 490b01d (Manifest_cache true)
1 |
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
app/controllers/application_controller.rb |
100.00 % |
2 |
1 |
1 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
2 |
2 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> 5a2009f (Fix)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
| app/controllers/books_controller.rb |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
93.33 % |
30 |
15 |
14 |
<<<<<<< HEAD
=======
100.00 % |
28 |
14 |
>>>>>>> 824bb2b (Featire specs)
=======
100.00 % |
28 |
14 |
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
100.00 % |
28 |
14 |
>>>>>>> e3e66f3 (Featire specs)
14 |
0 |
13.36 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
1 |
14.13 |
>>>>>>> aca90e3 (Rebased)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
app/controllers/books_controller.rb |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
app/controllers/books_controller.rb |
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
app/controllers/books_controller.rb |
>>>>>>> e3e66f3 (Featire specs)
=======
app/decorators/review_decorator.rb |
>>>>>>> 4f4ea3f (Featire specs)
100.00 % |
<<<<<<< HEAD
=======
7 |
4 |
4 |
0 |
1.00 |
| app/decorators/user_decorator.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
9 |
5 |
5 |
0 |
1.40 |
<<<<<<< HEAD
=======
1.86 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
1.86 |
>>>>>>> 8480924 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
app/controllers/books_controller.rb |
=======
1.86 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
8 |
4 |
0.67 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
app/decorators/review_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.00 |
| app/decorators/user_decorator.rb |
100.00 % |
9 |
5 |
5 |
0 |
1.40 |
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
1.86 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
1.86 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
1.86 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
1.86 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
| app/helpers/application_helper.rb |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
7 |
4 |
4 |
0 |
5.00 |
| app/helpers/constants.rb |
100.00 % |
27 |
21 |
21 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
| app/interactors/billing_update.rb |
87.50 % |
14 |
8 |
7 |
1 |
0.88 |
| app/interactors/shipping_update.rb |
87.50 % |
14 |
8 |
7 |
1 |
0.88 |
| app/interactors/user_update.rb |
100.00 % |
25 |
13 |
13 |
0 |
3.00 |
| app/jobs/application_job.rb |
100.00 % |
7 |
1 |
1 |
0 |
1.00 |
| app/jobs/cart_cleaner.rb |
60.00 % |
8 |
5 |
3 |
2 |
0.60 |
| app/models/address.rb |
>>>>>>> 6e923b9 (Featire specs)
100.00 % |
>>>>>>> 08edf50 (Featire specs)
24 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
12 |
12 |
0 |
13.50 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
13.86 |
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
6.14 |
| app/controllers/reviews_controller.rb |
100.00 % |
17 |
9 |
9 |
0 |
1.33 |
| app/controllers/users_controller.rb |
86.67 % |
31 |
15 |
13 |
2 |
2.93 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 9bfbd88 (Featire specs)
| app/decorators/author_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.50 |
| app/decorators/book_decorator.rb |
100.00 % |
23 |
12 |
12 |
0 |
<<<<<<< HEAD
12.70 |
| app/decorators/category_decorator.rb |
100.00 % |
3 |
2 |
2 |
0 |
1.00 |
=======
24.50 |
>>>>>>> aca90e3 (Rebased)
| app/decorators/paginating_decorator.rb |
100.00 % |
3 |
2 |
2 |
0 |
=======
7 |
7 |
0 |
>>>>>>> a5d032d (Fix)
1.00 |
<<<<<<< HEAD
| app/decorators/review_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
1.00 |
| app/decorators/user_decorator.rb |
100.00 % |
9 |
5 |
5 |
0 |
1.40 |
=======
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
| app/helpers/application_helper.rb |
100.00 % |
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
5 |
3 |
3 |
0 |
4.67 |
=======
7 |
4 |
4 |
0 |
4.00 |
>>>>>>> b28889f (Fix)
=======
75.00 % |
7 |
4 |
3 |
1 |
0.75 |
>>>>>>> 49e8a6c (Rebased)
=======
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
7 |
4 |
4 |
0 |
4.00 |
>>>>>>> 872e675 (Fix)
| app/helpers/constants.rb |
100.00 % |
27 |
21 |
21 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
| app/interactors/billing_update.rb |
87.50 % |
14 |
8 |
7 |
1 |
0.88 |
| app/interactors/shipping_update.rb |
87.50 % |
14 |
8 |
7 |
1 |
0.88 |
| app/interactors/user_update.rb |
100.00 % |
25 |
13 |
13 |
0 |
3.00 |
| app/models/address.rb |
100.00 % |
24 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
7 |
7 |
0 |
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
100.00 % |
>>>>>>> 4e81ea2 (Featire specs)
=======
app/controllers/books_controller.rb |
100.00 % |
>>>>>>> 08edf50 (Featire specs)
24 |
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
12 |
12 |
0 |
13.50 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
13.86 |
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
| app/controllers/home_controller.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.86 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
| app/decorators/author_decorator.rb |
100.00 % |
7 |
4 |
4 |
0 |
<<<<<<< HEAD
1.25 |
=======
<<<<<<< HEAD
1.50 |
=======
1.25 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
| app/decorators/book_decorator.rb |
<<<<<<< HEAD
90.00 % |
18 |
10 |
9 |
1 |
0.90 |
=======
<<<<<<< HEAD
100.00 % |
18 |
10 |
10 |
0 |
12.70 |
=======
90.00 % |
18 |
10 |
9 |
1 |
0.90 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
| app/decorators/category_decorator.rb |
100.00 % |
<<<<<<< HEAD
5 |
=======
<<<<<<< HEAD
3 |
2 |
2 |
0 |
=======
7 |
7 |
0 |
>>>>>>> c033601 (Rebased)
1.00 |
<<<<<<< HEAD
| app/decorators/paginating_decorator.rb |
100.00 % |
3 |
=======
5 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
2 |
2 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
7 |
7 |
0 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
| app/models/admin_user.rb |
100.00 % |
6 |
=======
=======
>>>>>>> c8da2e3 (Fix)
app/helpers/application_helper.rb |
100.00 % |
3 |
>>>>>>> 824bb2b (Featire specs)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
>>>>>>> e3e66f3 (Featire specs)
2 |
2 |
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
app/helpers/application_helper.rb |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
app/models/admin_user.rb |
>>>>>>> c033601 (Rebased)
>>>>>>> 75fa7e1 (Rebased)
100.00 % |
6 |
4 |
4 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
100.00 % |
6 |
4 |
4 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> aa7b40c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
6 |
4 |
4 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
6 |
4 |
4 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
6 |
4 |
4 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
=======
6 |
4 |
4 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
6 |
4 |
4 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 96aecde (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
6 |
4 |
4 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b (Manifest_cache true)
=======
=======
=======
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
6 |
4 |
4 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
6 |
4 |
4 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273 (Manifest_cache true)
=======
=======
=======
=======
app/helpers/application_helper.rb |
100.00 % |
6 |
4 |
4 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
=======
=======
app/helpers/application_helper.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
0 |
1.00 |
| app/models/application_record.rb |
100.00 % |
3 |
2 |
2 |
0 |
1.00 |
| app/models/author.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41e (Featire specs)
=======
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 4bf888b (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 393eff3 (Featire specs)
=======
>>>>>>> d9d85ca (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888b (Featire specs)
6 |
4 |
4 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3 (Featire specs)
6 |
4 |
4 |
=======
7 |
5 |
5 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
7 |
5 |
5 |
>>>>>>> 752f0c0 (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> 4e81ea2 (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
7 |
5 |
5 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
7 |
5 |
5 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
7 |
5 |
5 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
6 |
4 |
4 |
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
0 |
1.00 |
| app/models/authors_book.rb |
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
>>>>>>> 34509ee (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 5a2009f (Fix)
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
=======
>>>>>>> ae884b4 (Fix)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 4bf888b (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 393eff3 (Featire specs)
=======
>>>>>>> d9d85ca (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
| app/models/authors_book.rb |
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| app/models/billing.rb |
100.00 % |
2 |
1 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
6 |
4 |
4 |
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
app/models/authors_book.rb |
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
| app/models/billing.rb |
100.00 % |
2 |
1 |
1 |
>>>>>>> 67ab529 (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
0 |
1.00 |
| app/models/book.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
15 |
8 |
8 |
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
app/models/book.rb |
100.00 % |
13 |
9 |
9 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509ee (Featire specs)
0 |
1.00 |
| app/models/books_category.rb |
100.00 % |
6 |
4 |
4 |
=======
17 |
9 |
9 |
>>>>>>> 75fa7e1 (Rebased)
=======
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> d9d85ca (Fix)
17 |
9 |
9 |
=======
=======
>>>>>>> 311e9fa (Rebased)
15 |
8 |
8 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
app/models/book.rb |
100.00 % |
13 |
9 |
9 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> d8dd3b4 (Featire specs)
0 |
1.00 |
| app/models/books_category.rb |
100.00 % |
6 |
4 |
4 |
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
0 |
1.00 |
| app/models/books_category.rb |
100.00 % |
6 |
4 |
4 |
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
17 |
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> d0dc1f1 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 752f0c0 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
9 |
9 |
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
9 |
9 |
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 7a02bbe (Featire specs)
=======
app/models/book.rb |
100.00 % |
13 |
>>>>>>> 4552227 (Featire specs)
9 |
9 |
>>>>>>> e3e66f3 (Featire specs)
=======
19 |
10 |
10 |
>>>>>>> 5b7749a (Fix)
0 |
1.00 |
| app/models/books_category.rb |
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
| app/models/category.rb |
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
>>>>>>> b28889f (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 5a2009f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
>>>>>>> 8480924 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
| app/models/user.rb |
=======
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> e989024 (Add login registration pages)
app/models/review.rb |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> aca90e3 (Rebased)
100.00 % |
16 |
7 |
7 |
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
app/models/user.rb |
100.00 % |
8 |
2 |
2 |
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> c033601 (Rebased)
100.00 % |
16 |
=======
=======
app/models/user.rb |
100.00 % |
8 |
=======
app/models/coupon.rb |
100.00 % |
3 |
>>>>>>> 7c4ea7f (Fix)
2 |
2 |
0 |
1.00 |
<<<<<<< HEAD
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
app/models/user.rb |
100.00 % |
8 |
2 |
2 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
app/models/review.rb |
100.00 % |
16 |
7 |
7 |
>>>>>>> a5d032d (Fix)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
app/models/review.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
16 |
<<<<<<< HEAD
7 |
7 |
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
=======
=======
app/models/user.rb |
100.00 % |
8 |
2 |
2 |
0 |
1.00 |
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
app/models/user.rb |
100.00 % |
8 |
2 |
2 |
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
app/models/review.rb |
100.00 % |
16 |
=======
<<<<<<< HEAD
=======
=======
app/models/user.rb |
100.00 % |
8 |
2 |
2 |
0 |
1.00 |
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
app/models/user.rb |
100.00 % |
8 |
2 |
2 |
=======
=======
| app/models/order.rb |
100.00 % |
6 |
4 |
4 |
>>>>>>> 5b7749a (Fix)
0 |
1.00 |
| app/models/order_book.rb |
100.00 % |
4 |
3 |
3 |
0 |
1.00 |
>>>>>>> 7c4ea7f (Fix)
| app/models/review.rb |
100.00 % |
16 |
7 |
7 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 26b462d (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
=======
7.50 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
app/queries/book_query.rb |
87.50 % |
15 |
8 |
>>>>>>> 7375d4b (Manifest_cache true)
7 |
7 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
0 |
1.00 |
<<<<<<< HEAD
=======
=======
1 |
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
7 |
1 |
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
7.25 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7c4ea7f (Fix)
app/models/shipping.rb |
100.00 % |
2 |
1 |
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
1 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
=======
7.25 |
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
app/queries/book_query.rb |
85.71 % |
13 |
7 |
6 |
1 |
8.14 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
7 |
<<<<<<< HEAD
7 |
0 |
1.00 |
<<<<<<< HEAD
=======
1 |
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
7 |
1 |
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
>>>>>>> 7375d4b (Manifest_cache true)
7 |
<<<<<<< HEAD
7 |
>>>>>>> 9a49b7b (Rebased)
>>>>>>> 6066f92 (Add login registration pages)
0 |
1.00 |
=======
1 |
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
7 |
1 |
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 98beee2 (Manifest_cache true)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 88d49ad (Add login registration pages)
>>>>>>> 8480924 (Featire specs)
7.25 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
7.25 |
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
app/queries/book_query.rb |
85.71 % |
13 |
7 |
6 |
1 |
8.14 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3 (Featire specs)
=======
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
app/models/shipping.rb |
100.00 % |
2 |
1 |
1 |
0 |
1.00 |
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
app/models/user.rb |
100.00 % |
8 |
2 |
2 |
0 |
1.00 |
=======
app/models/user.rb |
100.00 % |
8 |
2 |
2 |
0 |
1.00 |
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
7 |
<<<<<<< HEAD
7 |
>>>>>>> a5d032d (Fix)
0 |
1.00 |
=======
1 |
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
7 |
1 |
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
=======
app/models/shipping.rb |
100.00 % |
2 |
1 |
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
1 |
<<<<<<< HEAD
<<<<<<< HEAD
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
=======
7.50 |
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
7 |
<<<<<<< HEAD
7 |
0 |
1.00 |
=======
1 |
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
7 |
1 |
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
7.25 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
| app/queries/book_query.rb |
87.50 % |
15 |
8 |
7 |
1 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
7.25 |
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
app/queries/book_query.rb |
85.71 % |
13 |
7 |
6 |
1 |
8.14 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
7.50 |
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
7.25 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
7.50 |
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2179316 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
app/models/shipping.rb |
100.00 % |
2 |
1 |
1 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
| app/models/user.rb |
50.00 % |
21 |
12 |
6 |
6 |
0.50 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
| app/queries/book_query.rb |
90.00 % |
17 |
10 |
9 |
1 |
9.30 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 5a2009f (Fix)
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> ae884b4 (Fix)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> c033601 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
app/queries/book_query.rb |
85.71 % |
13 |
7 |
6 |
1 |
8.14 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| app/models/user.rb |
53.85 % |
22 |
13 |
7 |
6 |
0.54 |
| app/queries/book_query.rb |
90.00 % |
17 |
10 |
9 |
1 |
9.30 |
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 6e923b9 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9a49b7b (Rebased)
>>>>>>> 89d7dcd (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b (Manifest_cache true)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2179316 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e (Fix book_spec decrease quantity and price)
=======
=======
=======
| app/services/book_service.rb |
88.89 % |
19 |
9 |
8 |
1 |
1.56 |
| app/services/coupon_service.rb |
100.00 % |
19 |
8 |
8 |
0 |
2.25 |
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| config/application.rb |
100.00 % |
22 |
6 |
6 |
0 |
1.00 |
| config/boot.rb |
100.00 % |
4 |
3 |
3 |
0 |
1.00 |
| config/environment.rb |
100.00 % |
5 |
2 |
2 |
0 |
1.00 |
| config/environments/test.rb |
100.00 % |
60 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> 75fa7e1 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 4bf888b (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 393eff3 (Featire specs)
=======
>>>>>>> d9d85ca (Fix)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
19 |
19 |
0 |
1.00 |
| config/initializers/active_admin.rb |
100.00 % |
12 |
11 |
11 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> d9d85ca (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
18 |
18 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
18 |
18 |
>>>>>>> 752f0c0 (Featire specs)
=======
18 |
18 |
>>>>>>> 4e81ea2 (Featire specs)
=======
18 |
18 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
18 |
18 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
18 |
18 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
18 |
18 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
18 |
18 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
18 |
18 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
18 |
18 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
0 |
1.00 |
| config/initializers/application_controller_renderer.rb |
100.00 % |
8 |
0 |
0 |
0 |
0.00 |
| config/initializers/assets.rb |
100.00 % |
14 |
2 |
2 |
0 |
1.00 |
| config/initializers/backtrace_silencers.rb |
100.00 % |
8 |
1 |
1 |
0 |
1.00 |
| config/initializers/content_security_policy.rb |
100.00 % |
30 |
0 |
0 |
0 |
0.00 |
| config/initializers/cookies_serializer.rb |
100.00 % |
5 |
1 |
1 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
>>>>>>> 6e923b9 (Featire specs)
=======
>>>>>>> 8249ff3 (Add login registration pages)
=======
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> e989024 (Add login registration pages)
=======
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> d8dd3b4 (Featire specs)
=======
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
=======
>>>>>>> 29e1af9 (Add login registration pages)
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 4bf888b (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f6e2026 (Add login registration pages)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> ed8ea63 (Add login registration pages)
=======
>>>>>>> 393eff3 (Featire specs)
=======
>>>>>>> 2be0d05 (Add login registration pages)
=======
>>>>>>> d9d85ca (Fix)
=======
>>>>>>> aca90e3 (Rebased)
| config/initializers/devise.rb |
100.00 % |
20 |
14 |
14 |
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> aa3618b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024 (Add login registration pages)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d05 (Add login registration pages)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
config/initializers/devise.rb |
100.00 % |
311 |
13 |
13 |
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
20 |
14 |
14 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
config/initializers/devise.rb |
100.00 % |
311 |
13 |
13 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024 (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
config/initializers/devise.rb |
100.00 % |
20 |
14 |
14 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
config/initializers/devise.rb |
100.00 % |
311 |
13 |
13 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af9 (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e2026 (Add login registration pages)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea63 (Add login registration pages)
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d05 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
>>>>>>> 8249ff3 (Add login registration pages)
=======
>>>>>>> e989024 (Add login registration pages)
=======
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> 29e1af9 (Add login registration pages)
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f6e2026 (Add login registration pages)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> ed8ea63 (Add login registration pages)
=======
>>>>>>> 2be0d05 (Add login registration pages)
=======
>>>>>>> d9d85ca (Fix)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> aca90e3 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> e989024 (Add login registration pages)
=======
>>>>>>> aa3618b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> f6e2026 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> ed8ea63 (Add login registration pages)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 2be0d05 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> d9d85ca (Fix)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024 (Add login registration pages)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
=======
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af9 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e2026 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea63 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d05 (Add login registration pages)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| config/initializers/filter_parameter_logging.rb |
100.00 % |
6 |
1 |
1 |
0 |
1.00 |
| config/initializers/inflections.rb |
100.00 % |
16 |
0 |
0 |
0 |
0.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> 75fa7e1 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 4bf888b (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 393eff3 (Featire specs)
=======
>>>>>>> d9d85ca (Fix)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| config/initializers/kaminari.rb |
100.00 % |
3 |
2 |
2 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> 75fa7e1 (Rebased)
=======
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> d9d85ca (Fix)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| config/initializers/mime_types.rb |
100.00 % |
4 |
0 |
0 |
0 |
0.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
>>>>>>> 6e923b9 (Featire specs)
=======
>>>>>>> 8249ff3 (Add login registration pages)
=======
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> e989024 (Add login registration pages)
=======
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> d8dd3b4 (Featire specs)
=======
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
=======
>>>>>>> 29e1af9 (Add login registration pages)
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 4bf888b (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
| config/initializers/omniauth.rb |
=======
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
config/initializers/omniauth.rb |
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
config/initializers/money.rb |
>>>>>>> aca90e3 (Rebased)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
config/initializers/money.rb |
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
100.00 % |
3 |
3 |
3 |
0 |
1.00 |
| config/initializers/omniauth.rb |
100.00 % |
8 |
3 |
3 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
>>>>>>> adc21e0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> e989024 (Add login registration pages)
=======
>>>>>>> aa3618b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
<<<<<<< HEAD
config/initializers/omniauth.rb |
<<<<<<< HEAD
=======
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
config/initializers/money.rb |
>>>>>>> c033601 (Rebased)
>>>>>>> 6066f92 (Add login registration pages)
100.00 % |
3 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
2 |
2 |
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
3 |
3 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
config/initializers/omniauth.rb |
100.00 % |
3 |
2 |
2 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024 (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
=======
3 |
3 |
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af9 (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
3 |
3 |
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd (Manifest_cache true)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 8249ff3 (Add login registration pages)
=======
>>>>>>> e989024 (Add login registration pages)
=======
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> 29e1af9 (Add login registration pages)
=======
>>>>>>> 13fca83 (Rebased)
| config/initializers/omniauth.rb |
100.00 % |
8 |
3 |
3 |
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
config/initializers/omniauth.rb |
100.00 % |
3 |
2 |
2 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> aca90e3 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
>>>>>>> aa3618b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> d9d85ca (Fix)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
>>>>>>> f6e2026 (Add login registration pages)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024 (Add login registration pages)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af9 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e2026 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea63 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d05 (Add login registration pages)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| config/initializers/permissions_policy.rb |
100.00 % |
11 |
0 |
0 |
0 |
0.00 |
| config/initializers/wrap_parameters.rb |
100.00 % |
14 |
2 |
2 |
0 |
1.50 |
| config/routes.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
>>>>>>> 6e923b9 (Featire specs)
=======
>>>>>>> 8249ff3 (Add login registration pages)
=======
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> e989024 (Add login registration pages)
=======
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> d8dd3b4 (Featire specs)
=======
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
=======
>>>>>>> 29e1af9 (Add login registration pages)
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 4bf888b (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f6e2026 (Add login registration pages)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> ed8ea63 (Add login registration pages)
=======
>>>>>>> 393eff3 (Featire specs)
=======
>>>>>>> 2be0d05 (Add login registration pages)
=======
>>>>>>> d9d85ca (Fix)
7 |
4 |
4 |
=======
5 |
3 |
3 |
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
17 |
9 |
9 |
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
=======
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024 (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af9 (Add login registration pages)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e2026 (Add login registration pages)
=======
=======
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 6a9fede (Add login registration pages)
17 |
9 |
9 |
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
5 |
3 |
3 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 22ee41c (Add login registration pages)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
<<<<<<< HEAD
7 |
4 |
4 |
=======
5 |
3 |
3 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> f6e2026 (Add login registration pages)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
7 |
4 |
4 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
17 |
9 |
9 |
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
17 |
9 |
9 |
=======
17 |
9 |
9 |
>>>>>>> 9620751 (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
=======
=======
7 |
4 |
4 |
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024 (Add login registration pages)
=======
=======
=======
17 |
9 |
9 |
>>>>>>> bf554f4 (Rebased)
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
5 |
3 |
3 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
7 |
4 |
4 |
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
5 |
3 |
3 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
7 |
4 |
4 |
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
5 |
3 |
3 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
7 |
4 |
4 |
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af9 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
17 |
9 |
9 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e2026 (Add login registration pages)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea63 (Add login registration pages)
=======
=======
=======
=======
5 |
3 |
3 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
=======
=======
7 |
4 |
4 |
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d05 (Add login registration pages)
=======
=======
=======
31 |
17 |
17 |
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> 4f4ea3f (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e59c273 (Manifest_cache true)
=======
>>>>>>> a1a479e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3 (Featire specs)
=======
>>>>>>> 7afa007 (Manifest_cache true)
=======
>>>>>>> 841ee2e (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5a2009f (Fix)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 98beee2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6d (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2179316 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| spec/decorators/author_decorator_spec.rb |
100.00 % |
9 |
5 |
5 |
0 |
1.60 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 67ab529 (Fix)
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
spec/decorators/author_decorator_spec.rb |
100.00 % |
13 |
7 |
7 |
0 |
1.29 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ae884b4 (Fix)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| spec/decorators/book_decorator_spec.rb |
100.00 % |
36 |
15 |
15 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
1.73 |
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
>>>>>>> 5a2009f (Fix)
=======
>>>>>>> ae884b4 (Fix)
=======
>>>>>>> 2179316 (Manifest_cache true)
=======
>>>>>>> d9d85ca (Fix)
| spec/factories/addresses.rb |
100.00 % |
4 |
2 |
2 |
0 |
1.00 |
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 98beee2 (Manifest_cache true)
=======
>>>>>>> 160fb15 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
1.50 |
=======
1.46 |
=======
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
1.73 |
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
1.46 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
spec/decorators/book_decorator_spec.rb |
100.00 % |
27 |
12 |
12 |
0 |
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
1.46 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
=======
=======
1.73 |
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
1.73 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
1.73 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
1.46 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
1.46 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
1.73 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b (Manifest_cache true)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
1.73 |
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
=======
1.73 |
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
1.73 |
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
1.46 |
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6d (Manifest_cache true)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2179316 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
1.46 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273 (Manifest_cache true)
=======
=======
=======
=======
1.46 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
spec/decorators/book_decorator_spec.rb |
100.00 % |
29 |
13 |
13 |
0 |
<<<<<<< HEAD
1.50 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007 (Manifest_cache true)
=======
=======
=======
=======
1.46 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e (Fix book_spec decrease quantity and price)
=======
=======
=======
1.73 |
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
| spec/factories/admin_users.rb |
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> 251144b (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f (Fix)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
spec/factories/authors.rb |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
spec/factories/authors.rb |
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
spec/factories/authors.rb |
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 251144b (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> ae884b4 (Fix)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 0341d6d (Manifest_cache true)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b (Manifest_cache true)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273 (Manifest_cache true)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
spec/factories/addresses.rb |
100.00 % |
4 |
2 |
2 |
0 |
1.00 |
| spec/factories/admin_users.rb |
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
100.00 % |
6 |
4 |
4 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
8.00 |
=======
7.00 |
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
7.00 |
=======
8.00 |
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
1.00 |
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
8.00 |
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
8.00 |
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
8.00 |
>>>>>>> e3e66f3 (Featire specs)
| spec/factories/authors.rb |
80.00 % |
18 |
10 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> ae884b4 (Fix)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
8 |
2 |
2.50 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> 8480924 (Featire specs)
=======
8 |
2 |
2.50 |
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd (Manifest_cache true)
=======
8 |
2 |
2.50 |
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b (Manifest_cache true)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6d (Manifest_cache true)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28 (Manifest_cache true)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
>>>>>>> 7afa007 (Manifest_cache true)
spec/factories/authors.rb |
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509ee (Featire specs)
=======
7 |
3 |
0.70 |
>>>>>>> 75fa7e1 (Rebased)
=======
8 |
2 |
2.50 |
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> d8dd3b4 (Featire specs)
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 393eff3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888b (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
7 |
3 |
0.70 |
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
8 |
2 |
2.50 |
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| spec/factories/authors_books.rb |
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> 75fa7e1 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 4bf888b (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 393eff3 (Featire specs)
=======
>>>>>>> d9d85ca (Fix)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| spec/factories/billings.rb |
100.00 % |
10 |
8 |
8 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
1.00 |
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
2.56 |
=======
<<<<<<< HEAD
69.56 |
=======
2.56 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
68.00 |
>>>>>>> 752f0c0 (Featire specs)
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
1.00 |
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
1.00 |
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
=======
1.00 |
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
1.00 |
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
| spec/factories/books.rb |
80.95 % |
35 |
21 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
17 |
4 |
45.52 |
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
spec/factories/books.rb |
100.00 % |
11 |
9 |
9 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
=======
2.56 |
>>>>>>> 02a399d (Manifest_cache true)
=======
69.56 |
=======
2.56 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
68.00 |
>>>>>>> 752f0c0 (Featire specs)
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
68.00 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
2.56 |
>>>>>>> fd6db03 (Manifest_cache true)
=======
69.56 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
15 |
6 |
0.71 |
>>>>>>> 75fa7e1 (Rebased)
=======
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> ae884b4 (Fix)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
17 |
4 |
<<<<<<< HEAD
<<<<<<< HEAD
46.38 |
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
45.52 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
17 |
4 |
46.38 |
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
17 |
4 |
<<<<<<< HEAD
46.38 |
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
spec/factories/books.rb |
100.00 % |
11 |
9 |
9 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
=======
2.56 |
>>>>>>> 02a399d (Manifest_cache true)
=======
69.56 |
=======
2.56 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
68.00 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
46.38 |
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
68.00 |
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
=======
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
68.00 |
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b (Manifest_cache true)
=======
=======
=======
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
68.00 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
=======
2.56 |
>>>>>>> fd6db03 (Manifest_cache true)
=======
69.56 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
=======
=======
=======
15 |
6 |
0.71 |
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
17 |
4 |
46.38 |
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
spec/factories/books.rb |
100.00 % |
11 |
9 |
9 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
68.00 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
2.56 |
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6d (Manifest_cache true)
=======
=======
=======
=======
69.56 |
=======
2.56 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2179316 (Manifest_cache true)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196 (Manifest_cache true)
=======
=======
=======
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28 (Manifest_cache true)
=======
=======
=======
2.56 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
68.00 |
>>>>>>> 4e81ea2 (Featire specs)
=======
2.56 |
>>>>>>> aa7b40c (Manifest_cache true)
=======
68.00 |
>>>>>>> 08edf50 (Featire specs)
=======
2.56 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
69.56 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
68.00 |
>>>>>>> 7a02bbe (Featire specs)
=======
2.56 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273 (Manifest_cache true)
=======
=======
=======
69.56 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e (Fix book_spec decrease quantity and price)
=======
=======
=======
68.00 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
=======
2.56 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007 (Manifest_cache true)
=======
=======
=======
69.56 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e (Fix book_spec decrease quantity and price)
=======
=======
49.62 |
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41e (Featire specs)
=======
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 4bf888b (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 393eff3 (Featire specs)
=======
>>>>>>> d9d85ca (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888b (Featire specs)
| spec/factories/books_categories.rb |
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
spec/factories/books_categories.rb |
=======
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3 (Featire specs)
spec/factories/books_categories.rb |
=======
spec/factories/books_category.rb |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
spec/factories/books_category.rb |
>>>>>>> 752f0c0 (Featire specs)
=======
spec/factories/books_category.rb |
>>>>>>> 4e81ea2 (Featire specs)
=======
spec/factories/books_category.rb |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509ee (Featire specs)
=======
spec/factories/books_categories.rb |
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
spec/factories/books_category.rb |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
spec/factories/books_category.rb |
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
=======
spec/factories/books_category.rb |
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
=======
spec/factories/books_category.rb |
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
spec/factories/books_category.rb |
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
spec/factories/books_category.rb |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
spec/factories/books_category.rb |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
spec/factories/books_categories.rb |
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
spec/factories/books_category.rb |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
spec/factories/books_category.rb |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
spec/factories/books_category.rb |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
spec/factories/books_category.rb |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
spec/factories/books_categories.rb |
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
100.00 % |
6 |
4 |
4 |
0 |
1.00 |
| spec/factories/categories.rb |
100.00 % |
5 |
3 |
3 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
4.67 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
>>>>>>> 6e923b9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b (Manifest_cache true)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6d (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2179316 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273 (Manifest_cache true)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007 (Manifest_cache true)
=======
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
1.00 |
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
1.00 |
=======
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> 4f4ea3f (Featire specs)
3.33 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
3.33 |
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
3.33 |
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
4.67 |
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
4.67 |
=======
3.33 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
3.33 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
=======
=======
3.33 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
=======
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
=======
=======
4.67 |
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
4.67 |
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
4.67 |
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
4.67 |
=======
3.33 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
3.33 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
3.33 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
=======
4.67 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
4.67 |
=======
3.33 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
3.33 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
=======
3.33 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
3.33 |
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
=======
=======
3.33 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e (Fix book_spec decrease quantity and price)
=======
=======
=======
4.67 |
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3 (Add login registration pages)
=======
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e989024 (Add login registration pages)
=======
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 4f4ea3f (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f6e2026 (Add login registration pages)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> a1a479e (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed8ea63 (Add login registration pages)
=======
>>>>>>> 393eff3 (Featire specs)
=======
>>>>>>> 841ee2e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2be0d05 (Add login registration pages)
=======
>>>>>>> d9d85ca (Fix)
| spec/factories/users.rb |
=======
spec/factories/reviews.rb |
>>>>>>> aca90e3 (Rebased)
100.00 % |
7 |
5 |
5 |
=======
=======
<<<<<<< HEAD
=======
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> aa3618b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 8249ff3 (Add login registration pages)
<<<<<<< HEAD
spec/factories/users.rb |
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
spec/factories/reviews.rb |
>>>>>>> c033601 (Rebased)
>>>>>>> 8249ff3 (Add login registration pages)
100.00 % |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
4 |
2 |
2 |
>>>>>>> 9bfbd88 (Featire specs)
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
spec/factories/users.rb |
100.00 % |
4 |
2 |
2 |
=======
7 |
5 |
5 |
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
=======
=======
spec/factories/coupons.rb |
100.00 % |
8 |
6 |
6 |
0 |
2.50 |
| spec/factories/order_books.rb |
100.00 % |
7 |
5 |
5 |
0 |
1.80 |
| spec/factories/orders.rb |
77.78 % |
17 |
9 |
7 |
2 |
1.56 |
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
| spec/factories/reviews.rb |
>>>>>>> c033601 (Rebased)
100.00 % |
7 |
5 |
5 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
spec/factories/users.rb |
100.00 % |
4 |
2 |
2 |
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
7 |
5 |
5 |
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
0 |
1.00 |
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
spec/factories/users.rb |
100.00 % |
4 |
2 |
2 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
| spec/feature/book_spec.rb |
100.00 % |
202 |
105 |
105 |
0 |
2.37 |
| spec/feature/home_spec.rb |
100.00 % |
39 |
20 |
20 |
0 |
1.05 |
| spec/models/author_spec.rb |
100.00 % |
15 |
9 |
9 |
0 |
1.44 |
| spec/models/authors_book_spec.rb |
100.00 % |
15 |
9 |
9 |
0 |
1.44 |
| spec/models/book_spec.rb |
100.00 % |
23 |
16 |
16 |
0 |
1.69 |
| spec/models/books_category_spec.rb |
100.00 % |
15 |
9 |
9 |
0 |
1.44 |
| spec/models/category_spec.rb |
100.00 % |
14 |
8 |
8 |
0 |
1.38 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1f4d17 (Add login registration pages)
| spec/feature/book_spec.rb |
100.00 % |
202 |
105 |
105 |
0 |
2.37 |
>>>>>>> 8249ff3 (Add login registration pages)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
| spec/feature/book_spec.rb |
100.00 % |
202 |
105 |
105 |
0 |
2.37 |
>>>>>>> d8abfed (Featire specs)
| spec/feature/home_spec.rb |
100.00 % |
39 |
20 |
20 |
0 |
1.05 |
| spec/models/author_spec.rb |
100.00 % |
15 |
9 |
9 |
0 |
1.44 |
| spec/models/authors_book_spec.rb |
100.00 % |
15 |
9 |
9 |
0 |
1.44 |
| spec/models/book_spec.rb |
100.00 % |
23 |
16 |
16 |
0 |
1.69 |
| spec/models/books_category_spec.rb |
100.00 % |
15 |
9 |
9 |
0 |
1.44 |
| spec/models/category_spec.rb |
100.00 % |
14 |
8 |
8 |
0 |
1.38 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> a1a479e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 841ee2e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 841ee2e (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> d8abfed (Featire specs)
=======
0 |
1.00 |
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
| spec/factories/shippings.rb |
100.00 % |
10 |
8 |
8 |
0 |
1.00 |
| spec/factories/users.rb |
100.00 % |
7 |
5 |
5 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
11.00 |
=======
13.40 |
>>>>>>> 7c4ea7f (Fix)
| spec/feature/admin/author_spec.rb |
100.00 % |
57 |
31 |
31 |
0 |
1.48 |
| spec/feature/admin/book_spec.rb |
100.00 % |
<<<<<<< HEAD
61 |
32 |
32 |
0 |
1.41 |
=======
83 |
43 |
43 |
0 |
1.56 |
>>>>>>> a5d032d (Fix)
| spec/feature/admin/category_spec.rb |
100.00 % |
48 |
25 |
25 |
0 |
1.56 |
| spec/feature/billing_spec.rb |
73.08 % |
42 |
26 |
19 |
7 |
0.77 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
=======
3.33 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
3.33 |
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
=======
3.33 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
| spec/factories/shippings.rb |
100.00 % |
10 |
8 |
8 |
0 |
1.00 |
| spec/factories/users.rb |
100.00 % |
7 |
5 |
5 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
11.00 |
| spec/feature/admin/author_spec.rb |
100.00 % |
57 |
31 |
31 |
0 |
1.48 |
| spec/feature/admin/book_spec.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
61 |
32 |
32 |
0 |
1.41 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
83 |
43 |
43 |
0 |
1.56 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
| spec/feature/admin/category_spec.rb |
100.00 % |
48 |
25 |
25 |
0 |
1.56 |
| spec/feature/billing_spec.rb |
73.08 % |
42 |
26 |
19 |
7 |
0.77 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
=======
3.33 |
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
3.33 |
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
3.33 |
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
3.33 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
| spec/factories/users.rb |
100.00 % |
4 |
2 |
2 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f92 (Add login registration pages)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
=======
| spec/factories/users.rb |
100.00 % |
4 |
2 |
2 |
0 |
1.00 |
=======
3.33 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
| spec/feature/book_spec.rb |
100.00 % |
202 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> d8dd3b4 (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
spec/feature/book_spec.rb |
100.00 % |
202 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> 5a2009f (Fix)
=======
>>>>>>> ae884b4 (Fix)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
104 |
104 |
0 |
2.38 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 67ab529 (Fix)
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> 5a2009f (Fix)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
105 |
105 |
0 |
2.37 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> ae884b4 (Fix)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> 5a2009f (Fix)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
| spec/feature/cart_spec.rb |
100.00 % |
56 |
29 |
29 |
0 |
1.45 |
| spec/feature/coupon_spec.rb |
100.00 % |
50 |
30 |
30 |
0 |
2.17 |
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| spec/feature/home_spec.rb |
100.00 % |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> d8dd3b4 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
96 |
49 |
49 |
0 |
1.12 |
| spec/feature/login_spec.rb |
100.00 % |
35 |
19 |
19 |
0 |
1.16 |
| spec/feature/new_password_spec.rb |
100.00 % |
24 |
13 |
13 |
0 |
1.15 |
| spec/feature/registration_spec.rb |
100.00 % |
51 |
29 |
29 |
0 |
1.14 |
| spec/feature/review_spec.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
49 |
30 |
30 |
0 |
1.67 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
46 |
28 |
28 |
0 |
1.71 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
| spec/feature/settings_spec.rb |
100.00 % |
62 |
34 |
34 |
0 |
1.26 |
| spec/feature/shipping_spec.rb |
73.08 % |
42 |
26 |
19 |
7 |
0.77 |
| spec/feature/user_spec.rb |
100.00 % |
76 |
42 |
42 |
0 |
1.10 |
| spec/models/admin_user_spec.rb |
100.00 % |
8 |
5 |
5 |
0 |
1.40 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 67ab529 (Fix)
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> 5a2009f (Fix)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
39 |
20 |
20 |
0 |
1.05 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> ae884b4 (Fix)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> 5a2009f (Fix)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| spec/models/author_spec.rb |
100.00 % |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> d8dd3b4 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
13 |
8 |
8 |
0 |
1.50 |
| spec/models/authors_book_spec.rb |
100.00 % |
13 |
8 |
8 |
0 |
1.50 |
| spec/models/billing_spec.rb |
100.00 % |
27 |
20 |
20 |
0 |
1.75 |
| spec/models/book_spec.rb |
100.00 % |
23 |
16 |
16 |
0 |
1.75 |
| spec/models/books_category_spec.rb |
100.00 % |
13 |
8 |
8 |
0 |
1.50 |
| spec/models/category_spec.rb |
100.00 % |
12 |
7 |
7 |
0 |
1.43 |
| spec/models/order_spec.rb |
100.00 % |
10 |
6 |
6 |
0 |
1.33 |
| spec/models/review_spec.rb |
100.00 % |
20 |
14 |
14 |
0 |
1.64 |
| spec/models/shipping_spec.rb |
100.00 % |
27 |
20 |
20 |
0 |
1.75 |
| spec/models/user_spec.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 67ab529 (Fix)
=======
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> 5a2009f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> ae884b4 (Fix)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> 5a2009f (Fix)
=======
>>>>>>> f136376 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
15 |
9 |
9 |
=======
13 |
8 |
8 |
>>>>>>> 7c4ea7f (Fix)
0 |
1.50 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> d8dd3b4 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| spec/queryes/book_query_spec.rb |
100.00 % |
77 |
45 |
45 |
0 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
1.38 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
1.38 |
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
1.38 |
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
1.38 |
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8480924 (Featire specs)
1.00 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
1.00 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
1.53 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
1.53 |
>>>>>>> a5d032d (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
| spec/rails_helper.rb |
87.50 % |
23 |
16 |
14 |
2 |
0.88 |
=======
1.53 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> c033601 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
spec/models/authors_book_spec.rb |
100.00 % |
15 |
9 |
9 |
0 |
1.44 |
| spec/models/book_spec.rb |
100.00 % |
23 |
16 |
16 |
0 |
1.69 |
| spec/models/books_category_spec.rb |
100.00 % |
15 |
9 |
9 |
0 |
1.44 |
| spec/models/category_spec.rb |
100.00 % |
14 |
8 |
8 |
0 |
1.38 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
1.00 |
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
1.00 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
=======
1.00 |
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
1.00 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
1.00 |
>>>>>>> 183b6c5 (Manifest_cache true)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
=======
1.00 |
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
1.00 |
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
=======
1.00 |
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
1.00 |
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
1.00 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
=======
>>>>>>> 4552227 (Featire specs)
=======
1.00 |
>>>>>>> 998f08d (Manifest_cache true)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
| spec/models/user_spec.rb |
100.00 % |
5 |
3 |
3 |
0 |
1.00 |
| spec/rails_helper.rb |
87.50 % |
23 |
16 |
14 |
2 |
0.88 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
1.00 |
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| spec/support/configs/capybara.rb |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> 251144b (Manifest_cache true)
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 393eff3 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
100.00 % |
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
100.00 % |
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
100.00 % |
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
100.00 % |
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
100.00 % |
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12 (Featire specs)
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
100.00 % |
29 |
<<<<<<< HEAD
=======
=======
100.00 % |
30 |
>>>>>>> 752f0c0 (Featire specs)
=======
100.00 % |
30 |
>>>>>>> 4e81ea2 (Featire specs)
=======
100.00 % |
30 |
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
100.00 % |
30 |
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
100.00 % |
30 |
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774f (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
100.00 % |
<<<<<<< HEAD
29 |
=======
30 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
36.84 % |
29 |
>>>>>>> 02a399d (Manifest_cache true)
19 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
19 |
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
19 |
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
7 |
12 |
0.37 |
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
7 |
12 |
0.37 |
=======
19 |
0 |
1.00 |
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
100.00 % |
30 |
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
100.00 % |
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
=======
100.00 % |
29 |
19 |
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
19 |
0 |
1.00 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509ee (Featire specs)
=======
=======
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1 (Rebased)
=======
=======
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab529 (Fix)
=======
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
7 |
12 |
0.37 |
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
7 |
12 |
0.37 |
=======
7 |
12 |
0.37 |
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
19 |
0 |
1.00 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
100.00 % |
30 |
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
100.00 % |
<<<<<<< HEAD
29 |
=======
30 |
>>>>>>> d0dc1f1 (Featire specs)
=======
36.84 % |
29 |
>>>>>>> 02a399d (Manifest_cache true)
19 |
<<<<<<< HEAD
=======
=======
100.00 % |
29 |
19 |
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
19 |
0 |
1.00 |
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f (Fix)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b (Manifest_cache true)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c62602 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b4 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
7 |
12 |
0.37 |
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2179316 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 7424050 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273 (Manifest_cache true)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
=======
=======
36.84 % |
29 |
19 |
7 |
12 |
0.37 |
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007 (Manifest_cache true)
=======
=======
=======
=======
100.00 % |
29 |
19 |
19 |
0 |
1.00 |
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
| spec/support/configs/shoulda_matcher.rb |
100.00 % |
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41e (Featire specs)
=======
=======
>>>>>>> fc3774f (Featire specs)
=======
>>>>>>> d8abfed (Featire specs)
=======
>>>>>>> 13fca83 (Rebased)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 4bf888b (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
=======
>>>>>>> 393eff3 (Featire specs)
=======
>>>>>>> d9d85ca (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888b (Featire specs)
8 |
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
8 |
=======
<<<<<<< HEAD
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3 (Featire specs)
8 |
=======
9 |
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
9 |
>>>>>>> 752f0c0 (Featire specs)
=======
9 |
>>>>>>> 4e81ea2 (Featire specs)
=======
9 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9 (Featire specs)
=======
=======
9 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509ee (Featire specs)
=======
8 |
>>>>>>> 75fa7e1 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 8480924 (Featire specs)
=======
=======
>>>>>>> 365d41e (Featire specs)
=======
>>>>>>> c05ee51 (Featire specs)
=======
>>>>>>> f136376 (Featire specs)
=======
>>>>>>> 1ca9c0e (Featire specs)
=======
>>>>>>> 89d7dcd (Manifest_cache true)
=======
>>>>>>> f0e2e12 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
9 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
9 |
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41e (Featire specs)
=======
=======
=======
=======
9 |
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee51 (Featire specs)
=======
=======
=======
=======
9 |
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
9 |
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
9 |
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774f (Featire specs)
=======
=======
=======
=======
9 |
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed (Featire specs)
=======
=======
=======
8 |
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376 (Featire specs)
=======
=======
=======
=======
9 |
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0e (Featire specs)
=======
=======
=======
9 |
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd (Manifest_cache true)
=======
=======
=======
9 |
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12 (Featire specs)
=======
=======
=======
9 |
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3 (Featire specs)
=======
=======
8 |
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca (Fix)
5 |
5 |
0 |
1.00 |